From 7792a42b951aec1c2f29672e2b04596d297cc8e9 Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Wed, 15 Dec 2004 18:14:19 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.480 (41c07efbnheltqmPvYvCi8GYyKjgbg) cleanup. --- .../arch/xen/i386/kernel/smpboot.c | 11 ----------- .../arch/xen/kernel/evtchn.c | 19 ------------------- xen/arch/x86/memory.c | 4 ++-- xen/common/domain.c | 2 -- xen/common/event_channel.c | 6 ------ 5 files changed, 2 insertions(+), 40 deletions(-) diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c index 2cfd0140f5..1a80279c29 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/smpboot.c @@ -53,7 +53,6 @@ #if 1 #define Dprintk(args...) -#define xxprint(msg) HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg), msg) #else #include #endif @@ -116,7 +115,6 @@ void __init smp_alloc_memory(void) #if 1 int cpu; - xxprint("smp_alloc_memory\n"); for (cpu = 1; cpu < NR_CPUS; cpu++) { cpu_gdt_descr[cpu].address = (unsigned long) alloc_bootmem_low_pages(PAGE_SIZE); @@ -445,7 +443,6 @@ extern int cpu_idle(void); static irqreturn_t local_debug_interrupt(int irq, void *dev_id, struct pt_regs *regs) { - xxprint("local_debug_interrupt\n"); return IRQ_HANDLED; } @@ -674,10 +671,6 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) static int __init wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) { -#if 1 - xxprint("wakeup_secondary_cpu\n"); - return 0; -#else unsigned long send_status = 0, accept_status = 0; int maxlvt, timeout, num_starts, j; @@ -806,7 +799,6 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) printk("APIC delivery error (%lx).\n", accept_status); return (send_status | accept_status); -#endif } #endif /* WAKE_SECONDARY_VIA_INIT */ #endif @@ -1286,7 +1278,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus) if (cpu_has_tsc && cpucount && cpu_khz) synchronize_tsc_bp(); #endif - xxprint("smp_boot_cpus done\n"); } /* These are wrappers to interface to the new boot process. Someone @@ -1304,7 +1295,6 @@ void __devinit smp_prepare_boot_cpu(void) int __devinit __cpu_up(unsigned int cpu) { - xxprint("__cpu_up\n"); /* This only works at boot for x86. See "rewrite" above. */ if (cpu_isset(cpu, smp_commenced_mask)) { local_irq_enable(); @@ -1322,7 +1312,6 @@ int __devinit __cpu_up(unsigned int cpu) cpu_set(cpu, smp_commenced_mask); while (!cpu_isset(cpu, cpu_online_map)) mb(); - xxprint("__cpu_up ok\n"); return 0; } diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c index fc78139401..bf208335e5 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c @@ -497,22 +497,6 @@ void setup_misdirect_virq(void) (void)setup_irq(bind_virq_to_irq(VIRQ_MISDIRECT), &misdirect_action); } -static irqreturn_t xen_dbg(int irq, void *dev_id, struct pt_regs *regs) -{ - char *msg = "debug\n"; - (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg), msg); - return IRQ_HANDLED; -} - -static struct irqaction xen_action = { - xen_dbg, - SA_INTERRUPT, - CPU_MASK_CPU0, - "xen-dbg", - NULL, - NULL -}; - void irq_suspend(void) { int pirq, virq, irq, evtchn; @@ -617,9 +601,6 @@ void __init init_IRQ(void) (void)setup_misdirect_virq(); - printk("debug_int\n"); - (void)setup_irq(bind_virq_to_irq(VIRQ_DEBUG), &xen_action); - /* This needs to be done early, but after the IRQ subsystem is alive. */ ctrl_if_init(); } diff --git a/xen/arch/x86/memory.c b/xen/arch/x86/memory.c index a350b06d34..b7ef28bda1 100644 --- a/xen/arch/x86/memory.c +++ b/xen/arch/x86/memory.c @@ -1690,7 +1690,7 @@ void ptwr_flush(const int which) /* Ensure that there are no stale writable mappings in any TLB. */ /* NB. INVLPG is a serialising instruction: flushes pending updates. */ -#if 0 +#if 1 __flush_tlb_one(l1va); /* XXX Multi-CPU guests? */ #else flush_tlb_all(); @@ -1862,7 +1862,7 @@ int ptwr_do_page_fault(unsigned long addr) if ( (which == PTWR_PT_ACTIVE) && likely(!current->mm.shadow_mode) ) { *pl2e = mk_l2_pgentry(l2e & ~_PAGE_PRESENT); -#if 0 +#if 1 flush_tlb(); /* XXX Multi-CPU guests? */ #else flush_tlb_all(); diff --git a/xen/common/domain.c b/xen/common/domain.c index f21f0d85df..34ffb416b8 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -323,8 +323,6 @@ long do_boot_vcpu(unsigned long vcpu, full_execution_context_t *ctxt) goto out; } - printk("do_boot_vcpu for dom %d vcpu %ld\n", d->id, vcpu); - ed = d->exec_domain[vcpu]; atomic_set(&ed->pausecnt, 0); diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index e9d331f2d9..d7b22caf63 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -277,8 +277,6 @@ static long evtchn_bind_virq(evtchn_bind_virq_t *bind) return port; bind->port = port; - printk("evtchn_bind_virq %d/%d virq %d -> %d\n", - d->id, ed->eid, virq, port); return 0; } @@ -302,8 +300,6 @@ static long evtchn_bind_ipi(evtchn_bind_ipi_t *bind) return port; bind->port = port; - printk("evtchn_bind_ipi %d/%d ipi_edom %d -> %d\n", - d->id, current->eid, ipi_edom, port); return 0; } @@ -341,8 +337,6 @@ static long evtchn_bind_pirq(evtchn_bind_pirq_t *bind) return rc; bind->port = port; - printk("evtchn_bind_pirq %d/%d pirq %d -> port %d\n", - d->id, current->eid, pirq, port); return 0; } -- 2.30.2